From: Matthew Vernon <matthew@debian.org>
Date: Tue, 25 Aug 2026 15:21:08 +0000 (+0100)
Subject: Merge tag '10.48_rc1'
X-Git-Tag: archive/raspbian/10.48-2+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dfa7d96a11f77b061bb0a6759efd31f80f9f5968;p=pcre2.git

Merge tag '10.48_rc1'

Upstream version 10.48~rc1

Had to handle a conflict in pcre2-config.in
---

dfa7d96a11f77b061bb0a6759efd31f80f9f5968
diff --cc pcre2-config.in
index 4534ea0,f85e12f..ab8ee14
--- a/pcre2-config.in
+++ b/pcre2-config.in
@@@ -28,8 -28,29 +28,21 @@@ if test $# -eq 0; the
  fi
  
  libR=
 -case `uname -s` in
 -  *SunOS*)
 -  libR=" -R@libdir@"
 -  ;;
 -  *BSD*)
 -  libR=" -Wl,-R@libdir@"
 -  ;;
 -esac
  
  libS=
+ case "@libdir@" in
+   # system locations on Linux, no -L needed
+   /usr/lib|/usr/lib32|/usr/lib64|/usr/lib/*-gnu*)
+   ;;
+   /lib|/lib32|/lib64|/lib/*-gnu*)
+   ;;
+   # system locations on AIX and Solaris, no -L needed
+   /usr/lib/64|/usr/lib/amd*|/usr/lib/sparc*|/usr/lib/ppc*)
+   ;;
+   *)
+   libS="-L@libdir@"
+   ;;
+ esac
  
  while test $# -gt 0; do
    case "$1" in